revert hard to generalise optimisations