43616-88 Rewrite for PointMenu compatibility
forgot to add this to last commit