Revert "Attempting to implement a less cheaty method(...)"

This reverts commit b4639add42af2adede06598bde2b1c6e2fb1567c.