Revert "Shane's paper. Includes a change for Inkoo's old paper."

This reverts commit 02f203b91c14c68b0561cc64b2a26248c5e9f1f9.