Rollback what I wanted to commit to 1.9.x branch - oops!