reversing earlier change
Still trying to restore previous behavior.