b=20339

reverting patch as Andreas suggested this can break child branch from HEAD which are
not in sync with lustre-core/lustre.
once most of child branch are updated and there is no user of LPSZ we can land it.