Revert "Oops, got the nesting wrong on that last one."

This reverts commit e7b52a076d9582d13344e3fd51630343943f835e.