Revert a31bb0a..9bb838a

This rolls back to commit a31bb0ae0db68a720379856f39f0ca8f278f3771.