Revert 9931d98..92fd6be

This rolls back to commit 9931d989c8b69b46ab161679c4e50e67078c48cd.