These should be unnecessary now with DestroyImpl() and might break stuff. Reverts commits 5a934b2c and db2c0dc7. Change-Id: Ida880dfed9fa6445b3530e2c4788fd4974c8f9c7