Revert "Fix incorrect usage of attrs"

This reverts commit 04aa0885bb143fd0409fe133ca572004ffa6dc0e.