This reverts commit f7633be0b1. Need to change in gmm code. Will do it after switching to gmm dynamic link.
f7633be0b1