undoing improper merge

accidentally deleted lars' changes