Partially revert backport of commit 284c470