Revert "Don't need this anymore"

This reverts commit 73b725590ee078233c88a4db472962e42196471b.