Reverted a (premature) optimization that can lead to out of bound write.