Revert b1c0de1..33318e6

This rolls back to commit b1c0de1481a975589771d69cb868a000b3ecc3f8.