Revert 229d1d3..63e0865

This rolls back to commit 229d1d32ec7baf5a9002438a0fd66fc1f0092938.
writeup corrections