[2020] Roll back Rolling back the matchmaking changes

We'll be releasing an update later today that should resolve the remaining major matchmaking issues. Sorry and thanks for your patience!