Remove workaround using regexp since the upstream has been fixed.