Revert "Temporary fix."

This reverts commit 6eee5e113d51d53a3844cfbcd282173a7b84ac92.