This partially reverts commit b473cec508. Signed-off-by: Christophe Bedard <bedard.christophe@gmail.com>
b473cec508