Temporarily revert changes, prepare for proper fix (sorry for the cvs spam)