v2.1.4 1aa8cf9 _still_ broken. Fix w/o need for any regex.