Revert #3345 #3323

These tests did not pass. Sorry @dhensby but can you please re-submit this as a complete PR, and we'll make sure that travis passes these this time.