Revert SimpleRemote patch