Remove ugly hack.
Correctly set the required alignment of capability register values.