Revert search/replace in module, grmbl...

This partly reverts commit 7aa26c2fb8967f8d3a5f48d7733f836a185db440.