Revert "Broken code ... doesn't work"

This reverts commit aa5ec60d03a9b8aaf8ec77e3ded126ceee6e1569.