Has China’s Economic Shift Really Ended the Commodity Super-cycle?