Revert "um: Use swap() to make code cleaner"