Reverted commit 184f32c00243ab5920fa0c290f7fd6184b52eec1 (to be clean
with upstream)