Revert "Eliminate redundancy"

This reverts commit 14bd1fd67dd261dc1e70687d00797e5115a1c1e7.