[MOD] Core, #928: reverted to previous URI matcher