Revert 1244ea7..31930ca

This rolls back to commit 1244ea76c2d36ebd50910cef2ed9dbcbea43013d.
Got it. Figured out that bug.