This reverts commit 70d863fd. Reason for revert: Broke the few remaining builds that still use jack Change-Id: I437d583cf33d68e6d8fa3367e1ea54848b56e05b