This reverts commit 5d77f485cb. There are some edge cases that we need to handle better. Reverting this commit because we're going to do a beta release later today.
5d77f485cb
/tags/c/...