We pulled out options like this in d6bc73f9f0d8c83260a9e890e2f6286fa799a4ff , is there a reason why we're moving back to this pattern?