These changes may need to be warmed over. I tried to fix things with the least amount of disruption. I just wanted to get the bugfix_v2.0.0 branch working for people again.
