reverted dead code deletion