Revert "FW: Ribbon v1.0 overhaul"

This reverts commit c4d6df0e81efbe8384dd7145c2d16cdd8ebc1d7b.