Trying to fix the commit from BSydz

Change-Id: I97ad38dd25aa2634c50fe5c36d84d126bf73faf6