Revert 1a54774..b25065b

This rolls back to commit 1a547745b5831735fed05633af49d1925832049b.
post-screencast, for real.  the final thing!