Revert commit fd15b62a to ensure that we don't accidentally use Java 8 features.
Attach a file by drag & drop or click to upload
