Revert "Jump through hoops to get JUnit 4.11 to work"

This reverts commit 57a5ec2ef2c73078f076cf9f41d5bada547ebf24.