Backed out changes that compenstated for jython.

Requires custom jython 2.7b1 build:
https://bbjc@bitbucket.org/bbjc/jython