Reverting because of a regression in AspectJ 1.9.23, see https://github.com/eclipse-jdt/eclipse.jdt.core/issues/3823.