Revert "Tweaks to force it to run correctly."

This reverts commit 26b2f88044bc76e304882308bef47d9e16401d4d.