#810: Remove tabs; change order to match previously