revert Hopeful fix 12-20-14 (reverted from commit 667b6e7d379a489050e0e5d8c097e1a92b8c096c)
revert Update 12-20-14 (reverted from commit 83e52d13761a72c92a3f0e3ebf039f5dad1cff93)