Revert 26071ed..3d94bf4

This rolls back to commit 26071ed42415900ba542c061c02119c242e0e437.