replace hacky hack with a hacky hack hack

Change-Id: I0df7e471bf9cbd91c3cb1458f78555d5dee0afe2