Temporarily patch around lp:1090592
Merge pull request #371 from harlowja/p_folsom

Temporarily patch around lp:1090592