Reverting commit 44350. It is not really needed.