Revert "Valama: Fixed instability caused by last commit"

This reverts commit a641150aefe7703735e981d538b90a81fa7856e9.
Guanako: No null sourcerefs in refactoring method
Revert "package selection dialog updated."

This reverts commit 77dbf2b2ebbc6bd8464d1ba7816e0bfc252d6ce0.