I merged master into staging-next but accidentally pushed it to master. This should get us back to 87a19e90. This reverts commit ac241fb7, reversing changes made to 76a43923.