Revert "Merge branch 'rt_28256'"