... (rbhz#2184553) The proposed fix was provided by Adam Williamson. (cherry picked from commit f329e5dd44)
f329e5dd44