2f6a824f04
This reverts commitf079f43658. This only partially fixed a problem introduced in992ee045f1I'm reverting that commit in favor of a different fix, so this broken fix needs to go first. Signed-off-by: Derek Foreman <derek.foreman@collabora.com> (cherry picked from commit8b0125d601)