I think this is reasonable for now. I'll put the TODO into the method docblock as well, so we can identify it for 3.0.