remove workaround for fixed bug 3588
Merge pull request #549 from mikeshulman/bug3588

remove workaround for fixed bug 3588