Stupid stupid me...

Change-Id: Ic337165c267a2b3462f237aa8c7590ba7b3db3db
This works now (:

Change-Id: I05efe06b2f3dfa2624536bf9196a809e65a3f859