Revert "minor #12821 Remove deprecated class (MasterB)"

This reverts commit 3d637487f08368209274d61aaec278746101d440, reversing
changes made to 7a5762c1982e1675ab52a01d5b348343bfe3f4b0.