Revert, wrong branch

Revert, "I missed a few"
This reverts commit d60d3b838fe9ce8116c2e175aa94e55c04f478eb.

Revert, "Draft templates for sl5.x-x86_64"
This reverts commit 82143851101ec91203ae431b3a335682a03e6467