Revert "12/20/2014-0"

This reverts commit 8f72b5a674a8ad6605cfe4345c5da6fa00131024.