I'll agree that's a good solution but we expected better from core. They didn't have to make this change