This reverts commit 4b3c41d9.

This problem should be handled at recipe level.

Always Listen To Luke, He's Right. (tm)