Reverted last merge