Temporary workaround to adhearsion/adhearsion#377