Reverting diff fix for the time being

This reverts commit f7385f7dc69921bfa9b6b6d55b7df8b73a5b0fa7.