Reverted some of my changes because it broke stuff.