Revert 2570d1d..a24b525

This rolls back to commit 2570d1d0ea69ac2f3c5fa39e1e8568bb74724ac5.
All cleaned up -- only 1 warning left.