[ENH] Let's try to di this more rock solid

git-svn-id: file:///var/local/code.tiki.org/tikisvn/branches/11.x@47250 b456876b-0849-0410-b77d-98878d47e9d5