Reverts changes from 6ef4e9713124d890f1f7f0d2ecd23d8848f16b81 commit.