I was thinking that if @bajtos skip/todo (#786) stuff was brought it in it should be always be available but SKIP'd on platforms where it isn't used