Revert #1403: binary incompatibilities in scala-swing

this reverts #1403 to maintain binary compatibility with 2.10.0

review by @jamesiry