This reverts commit e3a3fa11, reversing changes made to a6ed14ff. this change might cause a mysterious performance issue