Revert "no spaghetti"

This reverts commit 6341359b0c4e61f8499587c4840b42852d885847.