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

This is to bring master-DCMMerge closer to the DynamoCore branch