Wrong branch. Revert "Preparing for new, fully automated collector".

This reverts commit 0f16b5bee4efe7f91ec7235bcd2fd2c07ede1fd5.