Revert 2f18815..85890d6

This rolls back to commit 2f18815226943e7cf1dd31f9a200ce4052fa29b9.