Reverted to ms2 light code

Changed back to original light code, since TAs are doing JSON parsing
instead of us