Looks like a revert of e2d3654e?