Revert "What about this implementation?"

Nope.

This reverts commit 6fa3c2f50fb1da11e8864a7a966ea8bc7a72e691.