Revert "oops not ready for primetime yet"

This reverts commit 4e10ec4003aac902e5205609bc499711b8a3d7a6.
more 2013 style updates