Revert "Change to block expression"

This reverts commit 3f908259ad0c0aa5b811e3725490f92d94e75140.