I think after #956 is merged this won't be necessary.