Closing since a similar patch was pushed already. Thanks!