Revert d7d76d5..e1b4e68

This rolls back to commit d7d76d5577127928f29e6fa57182d59d55faaa0d.