Cleaned up the thread so we can keep it in the WL, also moved back to the WL.