Revert "Temporarily make Experiment compatible with Java 7"

This reverts commit 25781422a8cad7235b08cad40309562a536c8826.