Revert "dirty hack?"

This reverts commit cd8c344401acada5f1ca3fda0fc8465d06ead82e.
still not working... *argh*