Revert 54e2fad..0c96439

This rolls back to commit 54e2fadb486b2b0af95099004dbbd7266933e0df.