Don't use symbols in template and re-add 1.8.7 build