[dj, chris] Removing the override attributes that were used for testing.