This reverts commit fb9e3d9f21. Fixes: #4154 Signed-off-by: Maksym Pavlenko <makpav@amazon.com>
fb9e3d9f21