Fix for latest upstream template update.