Revert "Well this did not work and easy to commit and revert."

This reverts commit 5a60850d3ecd429b7f18b705d3c56e2eb218cd78.