Revert "LPS-39722 Simpler fix"

This reverts commit 33d464739a05b983c41c750cb47ca6b90d500f3c.
LPS-39722 adjusting after src format.  need to support negative and positive numbers
LPS-39722 build taglibs