Attempt to fix a few issues that were accidentally introduced by missing some code from the original pull-request. See gh-45269
Attempt to fix a few issues that were accidentally introduced by missing some code from the original pull-request. See gh-45269