Reverted some more changes