revert revision 31500. not tested enough