revert last commit - user of lib will have to deal his own way with this caveat