Reimplementing to match FAKE PR