Closing resolved issued in preparation for releasing 4.3.6.
Reopening because this was also fixed in master so 5.0.0 needs to be added as a fix version.
Resolved and closing after adding 5.0.0 as a fix version.
Ugh, just noticed it didn't actually have to be reopened to add a new fix version. Oops.