4bd0b9c7ab
This reverts commit 106b1418bc.
Restores the commits lost during the revert of a merge on staging-next.