Revert 2c0d19c..245b65c

This rolls back to commit 2c0d19c61084fd8965a3f1eccdc5a32c5b914c74.