Revert "Apply 452650285a1b121dfee104e9435e593f8dce8ba2"

This reverts commit 92dace5bec80d55aa96ea2ef08a191d8f3f2eb58.
Apply Eric Milkie's patch