Removed conditional from Scenario#build