Revert "Don't look to preventDefault to prevent no-navigation bug"

This reverts commit c9104d132c8977bfc7a4cb8a0ed9f27f11733a7f.