Revert "A new version by Queequeg"

This reverts commit 149af8536d83ee3d5d926f0540f0bf84b22ab161.