Log Message:
Revert changes from previous commit as it was incomplete and thus failed to \ 
address the issue, changes made are much larger upstream.

Heads up by tron@