Revert cb70330..7066d1c

This rolls back to commit cb703308adbf996534d3466b842eb968c62cd15a.