Revert #1600 temporarily
Merge pull request #1614 from sjinks/revert-1600

Revert #1600 temporarily