0aeceaa5be
This reverts commit 39777363a63c603cfa68ca52d2f3c99eb04f2f46. Reason for revert: the frontend part of this change doesn't work. Change-Id: I53138e939a1b98578787457e48743fdc8abf658c