Revert "Semi revert"

This reverts commit cbb110a880b98f2124eac2b3c03b605bd621bf58.