Reverting style changes in master as well