Things got totally wrong with r1742196 which contained much more than expected. This reverts things which should not have been committed