Revert "tentative fix to Tachyon-151"

This reverts commit e2117eb35a6ba87ea2dc002942af9f4a3950009b.