SVN commit 1103253 by rkcosta: Backport r1103252. Do not strip of simplify an