Revert "Following ShoreDroid recommendation on 4.2.2 bugs."

This reverts commit 0b5d262e8ab3dfe176ad5d5007ec6da4dcba38d4.