Merge "Revert "Adjust monkey to changed internal APIs""