The aim of this article is to put the growing interest in epigenetics in the field of evolutionary theory into historical context. First, I assess the view that epigenetic inheritance could be seen as vindicating a revival of (neo)Lamarckism. Drawing on Jablonka’s and Lamb’s considerable output, I identify several differences between modern epigenetics and what Lamarckism was in the history of science. Even if Lamarckism is not back, epigenetic inheritance might be appealing for evolutionary biologists because it could potentiate two neglected mechanisms: the Baldwin effect and genetic assimilation. In the second section, I go back to the first ideas about the Baldwin effect developed in the late nineteenth century to show that the efficiency of this mechanism was already linked with a form of non-genetic inheritance. The opposition to all forms of non-genetic inheritance that prevailed at the time of the rise of the Modern Synthesis helps to explain why the Baldwin effect was understood as an insignificant mechanism during the second half of the twentieth century. Based on this historical reconstruction, in the last section, I examine what modern epigenetics can bring to the picture and under what conditions epigenetic inheritance might be seen as strengthening the causal relationship between adaptability and adaptation. Throughout I support the view that the Baldwin effect and genetic assimilation, even if they are quite close, should not be conflated, and that drawing a line between these concepts is helpful in order to better understand where epigenetic inheritance might endorse a new causal role.