Revert "bugs.. bugs.. bugs.."

This reverts commit 753448c3e6a433dd4c2596a9fcff2710b6950425.