revert the commit 2505 (because it is no more needed)