This reverts commit 3020fe8ebfbb9ee0a1f76fd9afb09b8d577e420e, reversing
changes made to de15703af096cad38d40361d696e236d197895cf.