Revert 31acff8..ca8bf89

This rolls back to commit 31acff826288a44d26298a1c328f7e71e23ae14c.