'kay, if we don't need it - i'll delete the comments, since we've bloated the PR and are wasting other people's reading time :)