Revert "using when in a different form."

This reverts commit 24529680248371d4cf73ae6e30674f797d83fd98.