Revert eacb57e..8297b4c

This rolls back to commit eacb57e4d2ac8c7f7642691eb2c8f247ad25ce03.