Temporarily package Mitch's hack to make delegation work again