Revert fc64094..ec802ba

This rolls back to commit fc64094b761d3c412b278308e1d1507b0c4f2c0c.