Fix for Pyro that should have been merged from master.