Revert bdb5729..04721ba

This rolls back to commit bdb5729bf561f9d2aae7e93f657ae9fc794c40d6.