Revert crazy commit

This reverts commit 61209ea0fe2975e377970236e848449b0bf6fd17.