Fix bug #21365 - make MP modification dep checks revert properly if not compatible.