revert 3176cd3f and hope anbe provides a proper fix soon