Revert e8aff41..e26b2f3

This rolls back to commit e8aff4151e9ecd8172e5f7e6e870ed5ad21e49f3.
Revert to correct starting point

Ready, Steady, Go!