Fix for patch b885bd7.