Revert c37f1b9..ece53d3

This rolls back to commit c37f1b996d73139d4ffb778d329d35531e718dc2.
Akshay and I made some big changes.