Reverting recent changes so they can be commited in separate branches and submitted as individual pull requests

Fingers crossed.