Revert "draft patch"

This reverts commit aa1546b0907c959a4df90a7e3d48bad0890d1f2f.