Revert dc79a1b..64269df

This rolls back to commit dc79a1be671fcd52ddf0d550f46812511b1a45c1.