Revert " Code review comments addressed"

This reverts commit a56d2acb09b5d2b730d31ab1f55f70559f8181c6.
Revert "Merge remote-tracking branch 'upstream/dev' into dev"

This reverts commit 6b2ff73ba74929e1a783f615e9566d2822d969f6, reversing
changes made to a8429a645ef9e608a637f3a0f6d83c938386902e.