Yes, no longer required and this is probably why this branch does not merge cleanly any more...