Merge "Revert "Temporary workaround for issue 3187563""