Rolling back to the previous revision -- looks this issue is being
worked on by Andy Berry anyway.