Implement pullrq #1240 better, I think.