reverted US2448
Merge pull request #1486 from lnader/revert_pull_request_1

reverted US2448