Restoring patch after merging meteor for 0.7