This reverts commit 461ffb80. Reason for revert: Breaking master, revert needs to be more targeted. Change-Id: I8fe96ab08d3f82abd9edd3360e9e57d78a0bf6ce