Reverting specific configurational changes to in order to merge with master branch