Move back to canonical meteor-router