Temporary --- Revert "Fixes for regressions introduced by #3404"

Reverts DynamoDS/Dynamo#3454