This issue appears to have been addressed in commit f0e359c87947326c7fb2f7b91ecbe351e9d8c683