Revert "Merge branch 'next' of ssh://github.com/PhoenixPilot/PhoenixPilot into next"

This reverts commit 61448786e247bc27f31d3add881c44fcc29e3443, reversing
changes made to 1ac0722e6d8139e6dd3b41787e20acd955cdded0.