Revert "11.15.2014 commit"

This reverts commit 6255b98a42267d822bd06b1b9e0a8fc3ca46afa4.