Reverting back to old-style analytics code