Merge "Temporary workaround for issue 3187563"