reapplyed the commented code

Change-Id: Ib8536167f24c28e7cfc9338540b229cfc9ecacb2