Signed-off-by: Akihiro Suda <suda.akihiro@lab.ntt.co.jp>
Remove combined interface and split implementations. Signed-off-by: Derek McGowan <derek@mcgstyle.net>