Revert "Undo this change"

This reverts commit f63f681d3c1db09347afc08d51fea8644dc589d5.