Revert "Merge pull request #212 from nignag/SmartLocals"

This reverts commit 3616006d4542213149e0c0f2582ab985bf59aadf, reversing
changes made to 77a8c5150c918983cd599dbfe42ee5da65eea877.