Revert "Needs to be debugged..."
This was an accidental commit.
This reverts commit bf9804f578010f67ae4b4feaf978bd5515712653.