Manually applied deleted changes from earlier merge!