This needs a bit more work before we can turn it on by default, see the next PR for a failing test case.