Let's leave this in for now, but keep #3863 open on doing it using Tern--if/when that gets fixed, we can take this out.