Revert "quick fix to make it work."

This reverts commit cd800150ffeb5247f86cd9ef806f1cba38980a33.