That code was a bad idea :) This is a good change.