Revert 27c1d15..27ce7a9

This rolls back to commit 27c1d151038fb07a44de702ab1aec8702a4fdbae.