Reverting changes again due to merge