Rollback recent lwt related changes