This commit partially reverts the previous commit of link below.

https://github.com/a2441918/build/commit/8de72a547880d228ab0b41029a6c6c0c71a7d558