Revert Microwatt workaround