reverted some really dumb changes