Revert "get rid of this"

This reverts commit 97c5e980d75049f21abe05d539f3517acff43e04.