Revert ""this" doesn't mean anything, cleanup of muzzle selection"

This reverts commit 9856df231a11de3ca8c6d32f44ed8fc6dda358e5.