Revert a2765a7..3f9dd00

This rolls back to commit a2765a74290997b6ae9fe625689373bf1a828923.