Revert plug mappings again