Reverted 383e0da commit.