Add back some of the reverted commit
2 files changed