Revert "merge stuff"

This reverts commit 90936403155be209dd23d09fbd959a76888b0909.
Revert "Trying merge that jstirnaman posted"

This reverts commit c31db4bc5951d3205364228195397a768c837763.