[#2436] Removing router:match from 2.0 - will put back on 2.1