Revert "Quick fix for scenario"

This reverts commit 6f38c3418026b3eb50d7e6dbcde08060218b7d7e.