This reverts commit 7130fc76. There might be some race condition going on. 960-default-smali fails sometimes.