Revert db5638a..fb2dcde

This rolls back to commit db5638ad57de6ea243111a042325ed36e2faf83b.