Reimplement changes lost by merge