Merge pull request #1047 from reaperhulk/remove-cms-macro

remove the macro we just added