Revert "WIP" (didn't notice that it's in master)

This reverts commit 2697aadd1850b65c417dc0c0c91266c25ffdc9de.