Better fix for Polymer Platform, the same as applied upstream.