Make external build_uri calls work
Bump revision to 2.1.2