LP#1787479: Restore spacing fixes