Partial revert

This reverts commit 320015ad2b01aa42815be65dc1efaeeed805e0a5.