Backing out a bad commit to fix an invalid compile error reported by Eclipse.