Revert "FW: Ribbon v1.0 overhaul"

This reverts commit 56e507a1fc0c7ec45d64690a35e8e492adee495e.