3.8: clean up (not-)capebus patches

Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>