Revert "Partially revert 77b7ea5"

This reverts commit 054af497b54de057b711a3601ab618bfc9133911.