Reverting "Fix some block breaking problems".