Revert afa245f..3e2ec81

This rolls back to commit afa245f68849fa0195c9d0a98235d84008f3751b.