Revert "fix to upgrade to 2.6"

This reverts commit 0e11f490858e266136ef5a14fd3809c850e56001.
tying to get back to something that works for 2.6