SAE works now. This reverts commit 003a923abe. Change-Id: I3d8a986a430303091f5b81098d5a70ba1b69df22
003a923abe