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

Change-Id: I5b4265138b7671b94077067ad4aed2c8c338f7bb