If we do a patch it'll probably have to be a slightly simplified version such as this