Revert "Remove deprecated overlay values"

these should go to cm-10.2 branch