reverting r98172 by popular demand