Revert adba3ec..44a359c

This rolls back to commit adba3eca1f11e587cfcbd4a17c64cb40498c7f02.