Revert "Fix for mapper 146"

This reverts commit 7c3536f696f0d4337f29a5966e34369cf815df19.