Trying to address r281289 post-Commit review. Peter, Mehdi, is this more reasonable to you?
Sure. LGTM