Merge "Revert^2 "Store pointer to the target method in accessor MHs."" into main