LPS-36638 ClassUtil's annotation processing logic is wrong
LPS-36614 Revert
LPS-36614 SF