Revert "Fixes Issue ID: 3396697"

This reverts commit 8b9ba616444a265df6cd2b4f4a0a39d808c65ade.
9 files changed