Revert changes to url schemas that support cls, the 2x validation isn't worth it (and is breaking)

Revert changes to url schemas that support cls, the 2x validation isn't worth it (and is breaking) #5285