Revert "AspectJ Update"

This reverts commit b98fb5390dc090339daef042ac5ce4e1379eed1f.