Revert changes to please Meteor 0.9.0