Revert "Merge remote-tracking branch 'origin/attrib-fixture' into autostaging"

This reverts commit c3a1f212b1389c4be3e62300a045812b162af0de, reversing
changes made to b89e2d16d4d58a23a438bfbb14a8366894179a5f.