Revert "Work around"

This reverts commit f36368da7e273a53cdd540bb1ccd2d50f4c6676c.