revert mustache fix since name collision wouldn't happen with the nimbus changes
2 files changed