Revert "Fix possible macro expansion faults"
Revert "Fix possible macro expansion faults"

This reverts commit 1fc4cf16b5e5aeded232f4e6a521a4927e958f64.

sxjscience/mxnet,sxjscience/mxnet,sxjscience/mxnet,sxjscience/mxnet,sxjscience/mxnet,sxjscience/mxnet,sxjscience/mxnet,sxjscience/mxnet,sxjscience/mxnet