Reverting Pull #390
Merge pull request #391 from DavidKarlas/revertPull390

Reverting Pull #390