Revert "Update existing Folder items' ranks to match their pre-permutation layouts." am: 36be1d3674 am: 9c40ee1b1c

Change-Id: Ibf1c66b51e566a0d9b424e1b8ee0d2c0a911f9cd