Revert useless tweaks