Revert "Again for now"

This reverts commit 519fc70debfa6ca3f2d6341279d5532d37f4a335.