Revert "Finish modification"

This reverts commit 6281abf001d8b7425b9c046d3ccda197e69766b9.