Revert 60f409d..57f23f9

This rolls back to commit 60f409d2ab5420914b2882966f3b80d0d72de576.