This reverts commit 4d73577f
I didn't mean to commit this to 1.x. It should instead go through the full merge request review process.