Backout [f517cb7f] because  they both come together anyway  and this one
is a macro.  See for
discussion.