Put back changes that were blown away from pull