revert to branch-32 code