Revert eeac73d..794c32b

This rolls back to commit eeac73d9038d45d5c8b6efde529c32b154e788f7.