Borked stuff
Revert "Borked stuff"

This reverts commit 0fa0ad8a2d27359ccd912448db62a87ef56c2212.
FPPS, RR done