Since this might break a few setups I'll postpone the zap
until after releasing the next snapshot on our road to 15.1.