Cleanup the previous PR
3.16.2