Revert 3fe1025..3a83f65

This rolls back to commit 3fe10254bba6f01e84f11502a8e90dc06d1fafb5.