undo work arounds for scala 2.9.2 bugs