Revert "ok"

This reverts commit 64e7b2ca72cae22329533ab1b76048abfa2f17db.
Reverting changes from Josh's push @ 5:50 PM 5/1/2014