Revert "rmmwat?"

This reverts commit 72b700952ece58fdfc4491b8065463edf5257689.