code moved to custom Meteor branch