Dropped junk from last merge conflict.