Revert hack now that meteor/meteor#2834 is fixed