Revert "Merge pull request #1384 from dlondero/issue-1384"
Revert "Merge pull request #1384 from dlondero/issue-1384"

This reverts commit ab9134baf6a8eb0592c265c00593e6705ee3b8cc, reversing
changes made to 6ea2340c309a42af44901182996f1e542bc6e785.

tomaszdurka/CM,zazabe/cm,tomaszdurka/CM,vogdb/cm,cargomedia/CM,tomaszdurka/CM,njam/CM,njam/CM,mariansollmann/CM,njam/CM,zazabe/cm,cargomedia/CM,alexispeter/CM,mariansollmann/CM,fauvel/CM,njam/CM,vogdb/cm,fvovan/CM,tomaszdurka/CM,tomaszdurka/CM,fauvel/CM,njam/CM,cargomedia/CM,fvovan/CM,mariansollmann/CM,zazabe/cm,cargomedia/CM,fauvel/CM,vogdb/cm,alexispeter/CM,fvovan/CM,alexispeter/CM,vogdb/cm,fauvel/CM,fvovan/CM,vogdb/cm,zazabe/cm,mariansollmann/CM,fauvel/CM,alexispeter/CM