I agree, there's a separate branch underway removing it altogether :)