This can be merged then, as long as we have an issue in the right milestone to remind us to fix it.