Regression: Fix previews

previews broken by I28fdffca6d160b68ca1b37bcefc2e033a742568e
add workaround for bug 54607

Change-Id: If367d4de53ccb73f0818d9d1886903bd6654ced1