LPS-45978 revert changes to the taglibs that were merged last week

These changes were approved by @natecavanaugh

cc @Preston-Crary