Revert 35117b8..3138597

This rolls back to commit 35117b8c1cf7b6948997239e4ef23c6c15238875.