Redo changes that Frank undid in his merge :s