Revert d242f1f..81cf332

This rolls back to commit d242f1f76c95f4e27d5fb7a2c3ad9b758e9495b9.