Reverted some weird stuffs