Revert a4fd423..4d8616a

This rolls back to commit a4fd423f2611de1bd5f341ab48e628d2732523b1.
Additional optimisation

Reg tested- still works