This reverts commit 51fe214218512fbd277ede0075cccac9f9d2b562. It was intended for the staging branch.