Revert "some crazy code"

This reverts commit 41297ae96b637d0bbf426d81ed2da1b0225a7d28.