Revert temporary workaround

(cherry picked from commit c58fbf5)
1 file changed