Revert b3ce11d..8432c00

This rolls back to commit b3ce11d11b43ddfcc72fa3f8b32bdb3bfe6184a3.