Revert "Changes specific to Scala 2.11."

This reverts commit d6bee9f9a338f9ffecbe8f1c4bd525e2fd61f5b6.