temporarily reverting to whitespace-only optimisation