Log Message:
Instead of "patch-and-substitute", just do "substitute" step \ 
by using
SUBST_CLASSES.  Removes the need for patch-ac.  Also improve the comment
for the post-build step since the workaround is here to stay.