Revert to previous

Code got smushed up somehow, so reverting