Maybe we don't need this any more. See my comments below :)