Reverted back to Commit 186 state.

All base templates reverted back to that state.

THIS IS FOR .SQM ONLY.