Revert "Fixed Aumwood"

This reverts commit 71d3640ce82ba8228bf7b1dc287bb080a3712b29.
Revert "Revert "Fixed Aumwood""

This reverts commit 7c2c9c73dbb9b068daaea1ed86763fc51e9c7508.