Revert some recent test mod to work with poe