Revert "yeap! new comp =)"

This reverts commit ce78301269e93a859b26e9a7bf50bd380adacfab.