Revert "fix for runtime caused by #398"

This reverts commit 98a0e852277735c1318b3837f9fba983086847cc.