Revert 1e30f84..c9c62bb

This rolls back to commit 1e30f8452f6821db510bb8295e3d96a200f1f5f5.
Ready for release