Revert "Export Template fails when template has no master value"

This reverts commit a2905c13f6f42095e07fa20ae402e514400cecd0.