workaround rather maddening endian-specific template bustage

Change-Id: I69dc97c93ef5efe8d71074ac3eca06a3bbc45253