Revert "Other changes for zooming."

This reverts commit 2e0164831b285163108e1fea3cf8e1ddf7e54743.
Merge pull request #2 from pruano/master

Fix for uncompilable master