Revert "Catch up on legacy support commits (Credit CM)"

This reverts commit e9a8e546726b687e916e572b9dd30e4cb2b1521b.