Revert deeaadf..081074b

This rolls back to commit deeaadfb97cff5defecb943957093c7a3a554f7c.