Reverting experimental stuff in r17121.