Revert "change for R5"

This reverts commit 4db978f7a3304aed031efe1537fa4558c50f98f4.