Revert "DON'T USE THIS PLEASE!"

This reverts commit d3dc573d97dd18c9261d4b5a0ed73a8443109a2f.