- Reverted some optimisations in non-enabled mode