This is actually a behavior change. We might want to make a virtual for this as well