Addressed this in commit ec4ba0a5301b593b93bff4f0f74dc8ec2de2df36.