MFC r285878 (stable/10 r286145):
Revert r173708's modifications to vm_object_page_remove().
This fixes inconsistencies encountered by vm_object_unwire() or
by the buffer cache when the file is truncated.

Approved by: re (gjb)