Revert 51f9fb1..dfc9e5a

This rolls back to commit 51f9fb11802c3a8c88f1591186decd54e1aaed3f.