Revert "Other version?"

This reverts commit 13de67a42fe3de160b58341c2499211cb30c7138.
Revert 6cd5006..25a2cb0

This rolls back to commit 6cd5006fa170c4d2bf07cc5ab7b4b2ad14279d91.