reverted some unnecessary optimization