This reverts commit 0fc5d0907827451092afed17fb04dc1b3417e316.

Authored by anjani on Apr 17 2020, 9:39 PM.