Revert c8f1b63..dbdecb1

This rolls back to commit c8f1b639a0be70afdfa82c0932c7b4506da74b98.