Revert 71d7f99..eb88aea

This rolls back to commit 71d7f9928ebe5305e7a10c69e2336b7c14be4f70.