Work around hanging module.  Thanks to Daniel Hozac for the tip.
Merge pull request #2213 from huberteff/devel

Work around hanging module.  Thanks to Daniel Hozac for the tip.