[dj] Adding patch back with old patch.