This reverts commit 866f449cffe652985c458055bab2a8876ab74657. Signed-off-by: Gilles Gouaillardet <gilles@rist.or.jp>