Reverted some fucked up changes