Revert edc76b6..1d38a70

This rolls back to commit edc76b6efb2e34e1adc6e9bc5e480a999e81e9c7.