Reverting this, trying to find the recursion here...

Signed-off-by: sigilworks <tj@sigilworks.com>