Reverting back as this creates another bug

Still don't know how the template works to make this a valid fix.