Revert "Change few attributes to be unset"

This reverts commit 38dd1652638d1e3c00d2af17322adcd80afe6479,
which has a syntax error, causing all the Neutron 3rd party CI
jobs to fail.