MFC r248214:
  Revert r246917, as it is causing incorrect behaviour as reported on
  freebsd-current.

Approved by:	emaste (co-mentor)