Revert to older commit to fix massive memory issue