Revert ff5cd35..20b8fd5

This rolls back to commit ff5cd352a63ec79982d8804b8574a5e9771fd8db.