Swapped branches because @FatalEagle thinks it was ugly