Fork to preserve known state for myself until DigiACTive's patch is merged into mainline