Reverting Merged PR #4193, #3959