Revert "test-iosched: sync with CAF for ease of patching"

This reverts commit ad13b6d52c931449c37c4465e711c9ff51a93a91.