Revert "Some changes to subproject"

This reverts commit 9a76aba9132fdc9bea4a8e2b2fc3bd38309e97ce.