Part of the fix for servo/servo#3154.