Revert "Revert "Bugfix for meteor 0.6.0 update interoperability.""

oops.. My last branch accidentally had this commit reverted, re-applying.

This reverts commit 1503950e751be87a89889e1854ced50eaf1c5d26.