Oops, reverted the wrong commit.

This reverts commit 9bda27a79cab73d54f718ff0b55a0c2221006139.