Reverting 9f1391acb6579ee882ec24323d3478525bafb768