Revert 2919665..613d2f6

This rolls back to commit 29196655ae8a2a14121d8fc2145365fc22c32ee0.
6/8/14