Revert "Update m4_ifdef"

They say two wrongs don't make a right, but sometimes applying the same
fix twice creates a bug.

This reverts commit 6faa95ecd505a3c724679ab1f395b68b3e3051fd.