Like the other PR, please drop this - hopefully the OT folks will fix it soon.