Revert "Fix #873"

This reverts commit 72af4989f96e7f296d83c7f56d99e048131e0a25.
Because of the discussion in #873.
I will merge as soon as Travis succeed.