Can't let this live on! See PR #2028.