reverting patch 176508.