Revert RAF stuff - needs cleaning up