Revert d0e922e..b1d0c65

This rolls back to commit d0e922e3b802fd7f42cfbba82890d101af634ea1.