Revert "try separating 2 scenarios"

This reverts commit b534495650dfff4948c9a7daa276d24392040a61.