revert changeset 15081 seems to break Alice box devices