Revert "Fixes to OpenBSD template files"

This reverts commit 65eaa599d17ad847bc1cd47b53f70c4f3a675cc9.