Revert "Incomplete"

This reverts commit 545c848c2e29ead6f1493e4f4a8b8caadb6def6e.