undo 'fixes', proper fix was done by #558
style fixes