Reverted last two commits