See above comment in CHANGES. This is wrong.