Hoping to fix #897. Thanks Slade-!
Partial revert.
The fix. The fix is here.
Final fix for the issue.
Um?
Hoping we fixed this for good.