Reverted some of my previous tweak.