Scenario 2

This is not ready for merge. I just want to get some eyes on it.

@kadst43 
Are we sure that this change is safe?  Are there other cases where what we want will be the functionality that we had?