removed pre1.2 workaround, fixes #6, versioned at 3.1