I need to look into the internals of the new connect/express to be able to understand consequences of this change. I'll try to review by end of this week.