Customisations moved back into core as overlays unreliable