Revert dc7ce21..93116da

This rolls back to commit dc7ce21b32abda2acb7cf9f6e860a786a89270d5.