Revert "Merge pull request #16621 from millermedeiros/972666-lines-over-...

...events"

This reverts commit b1fdd71bf7f3455dbbf015e08175145e02b36d2a, reversing
changes made to 877ddee8e913319780f7e9ccf1770c8af584b976.