(#4338)  Fixed identified issues.
Revert "(#4338)  Fixed identified issues."

This reverts commit 72e80e7f7bc5bdc4e4d6dd623a003e3fb00072c0.
(#4338)  The real set of fixes.