Revert 3766a9a..daf4c3f

This rolls back to commit 3766a9a392e526f9f7f92ef7e2b5fb3a8006f594.