Bug-Ubuntu: https://launchpad.net/bugs/1891338
Candidate for master and 3.0.
This will create a new commit in order to revert the existing changes.
