[WIP] Fix #4996 regression.

Signed-off-by: Michael Gooden <michael@bluepointweb.com>