diff --git a/changes.txt b/changes.txt
index c6aae4820..64b39b5b3 100644
--- a/changes.txt
+++ b/changes.txt
@@ -9,7 +9,6 @@ LOVE 0.9.1 [Baby Inspector]
   * Added ParticleSystem:setRelativeRotation.
   * Added love.graphics.setWireframe for debugging.
   * Added Mesh:setDrawRange and Mesh:getDrawRange.
-  * Added instancing support to Meshes with Mesh:setInstanceCount.
   * Added CircleShape:getPoint and CircleShape:setPoint.
   * Added Mesh/SpriteBatch/ParticleSystem:setTexture, accepts Canvases and Images.
   * Added high-dpi window support for Retina displays in OS X, via the 'highdpi' window flag.
diff --git a/src/modules/graphics/opengl/wrap_Mesh.cpp b/src/modules/graphics/opengl/wrap_Mesh.cpp
index 83e21afd3..c70d7970d 100644
--- a/src/modules/graphics/opengl/wrap_Mesh.cpp
+++ b/src/modules/graphics/opengl/wrap_Mesh.cpp
@@ -371,8 +371,12 @@ static const luaL_Reg functions[] =
 	{ "getVertexCount", w_Mesh_getVertexCount },
 	{ "setVertexMap", w_Mesh_setVertexMap },
 	{ "getVertexMap", w_Mesh_getVertexMap },
-	{ "setInstanceCount", w_Mesh_setInstanceCount },
-	{ "getInstanceCount", w_Mesh_getInstanceCount },
+
+	// Disabled for now, since implementation is incomplete and might change
+	// if/when VertexBuffers / custom vertex attributes are added.
+	// { "setInstanceCount", w_Mesh_setInstanceCount },
+	// { "getInstanceCount", w_Mesh_getInstanceCount },
+
 	{ "setTexture", w_Mesh_setTexture },
 	{ "getTexture", w_Mesh_getTexture },
 	{ "setDrawMode", w_Mesh_setDrawMode },