Revert d2d51a9..2dce483

This rolls back to commit d2d51a9d905a236fafe16121fd053f1ce6235e35.