Revert "12/6/14 6:40pm"

This reverts commit 09effac6ee8609122b1acfde3296559bbf3ee5b6.
12/7/14 11:27am

Continuing past the bug that we went back from