This reverts commit f93e1764, reversing changes made to 2771375d. The MR was meant for staging, not staging-next, so let's move it.