(cherry-picked from fac67a984268ef8f7de952666fda6d8d32754f5f)

Since we don't have this in off method and its a common perception
that this is a rudiment code

Ref gh-2248
Closes gh-2249