Revert "Missing parts...I guess.."

This reverts commit 44adc8930e9f2e00233adfdf80662ac71a7a3a88.