Comment 5 for bug 860159

I've had to comment out a few more constraints to get the suite to run without failure. I do still get 7 test failures with the branch though. I'll push what I have and will continue to work on getting the test suite to pass. I won't merge the branch until I do. Then I'll file a separate bug on the constraint issues.