Reverted unnecessary changes in merge

derp derp derp