Revert "[bug 935001] Fixed spacing and alignment"

This reverts commit c6352b4628dec8a5a7277365418fd226a21668ee.