reverted change that disabled loading of location templates