Revert "Use internal aptly when testing models"

This reverts commit 3a3b50664260fa9aab4c2d64e7b1a50aa4814ac1.

Change-Id: I199f31fbcfeb7dd7a6e66530e282e05539884db3
1 file changed