Revert e323ae2..b1727e2

This rolls back to commit e323ae24319f88c52fd46f575753c5dd2d309b00.