Revert "12-19-2014"

This reverts commit 30d4a1a6c76166310e00e2b348d6c73cb513ffac.