Reverting some tweaks