Revert "Merge branch 'blk@babysteps' into 'develop'"

This reverts merge request !648 (merged)

This way of lightly adding athens and babylon support isn't going to work for the binary serialisers in operation, so lets go back to the drawing board.