Others were seeing this bug today (dcbw, mccann), so committing this for now until a better fix can be made upstream. https://bugs.freedesktop.org/show_bug.cgi?id=35024
Christopher Aillon