Revert bd8c2b4..e365c76

This rolls back to commit bd8c2b45cfb5fdb6736a987f87cc7c3d2231ba45.