Revert "Revert "Underped redeclaration""

This reverts commit 3f00f8eb20588d1106737b026969f794328f4fa5.