LP#1947173: Clean up bad cataloging pot hole