Revert my reverts
This reverts commit 23ee6db476c6ad8f798983f35f4e8b7139dbfd3b.