Revert 38b6c9f..e33f568

This rolls back to commit 38b6c9f3b5a98ff89b85354b8b2f2c776bda04ec.