This reverts commit 7b9f20e01126a06fc0ce7c15a3ea63ea063aedb5.
"If only that would have worked"