[LAA] Revert a small part of r239295