Revert 542034b..ed95f52

This rolls back to commit 542034be275b3d0669cbeab703ba92c2072e4f52.