Revert "Draft #33"

This reverts commit 522699d891d36396f7e683242540082dd92aeeba.