Undo most changes as they are not needed. Actually works now.