See main post for update.