OOOPS removed to much! Revert "forgot  the removals.."

This reverts commit 5f2c450683a2f338cb0d353328f7bca65a2c168e.
Hopefully better this time