rolling our own This is reverting a previous decision and boils down to replacing one can of worms by another...