Revert 285547a..d8fbb32

This rolls back to commit 285547ac4bcb192596cd6c8332ce5d2a723c9b24.