Revert be2d49b..4afe335

This rolls back to commit be2d49b7cb8d936774077784b9b5ad150a985b26.
Reinstated edits