Note that this was working before, as in the gist