Removed forced normalization (bug fixed in rev 9ff8fe243)