Revert bfedfa8..0a5825d

This rolls back to commit bfedfa8ef431f7ed2993117c0306feca3d600538.