I lied about the last commit. It should work well now.