Also removes functionality added in f9fec3a2 because it changes API. (That patch shouldn't have been added anyway.)