Targetting this to xenial so we can verify that this regression won't happen there when fixing bug 1744318.
Targetting this to xenial so we can verify that this regression won't happen there when fixing bug 1744318.