Revert "4.2.2_r1.2"

This reverts commit c95cf8b23b1549805b13c581c26c265c312ea08a.