This is also the official workaround, based on other responses.