Removed workaround, sent patches to devkit-power instead