Revert "Merge pull request #1370 from kassemsandarusi/issue_2547"

This reverts commit c422c95e1a7421a1456cb2cbd3b20e96eb1b59b7, reversing
changes made to e9655c73bbf1f2b3dab0a17d3ea7483ee3a92d5e.
Revert "Merge pull request #1370 from kassemsandarusi/issue_2547"

This reverts commit c422c95e1a7421a1456cb2cbd3b20e96eb1b59b7, reversing
changes made to 41dfe5b88dc9fb9f5654a897082bf99f89c3a661.