This reverts commit 4e0af590e8. This patch does not work at all with AWSLC! This is incredible! No need to backport.
4e0af590e8