Revert fee6303..3b0f74a

This rolls back to commit fee630379912705e3d8d9e5ade0a5ff537a8c253.