Revert Plan B workaround - not effective