Revert 5a3818a..12dbb25

This rolls back to commit 5a3818aba07678f28362d1d1e8734681a4308c28.