Revert "hack to get it working"

This reverts commit 5e40cc188adfc6b0b85d66eb95659f9118f1e68d.