This commit overwrites the previous backporting that was done in order
to introduce the backporting work as a separate commit to simplify
future maintenance.