Add option to turn off function remapping.  See Issue #145.