Revert #1169

This reverts commit a46f9e686c1a582c84d73c9b7a37cf7185c0beab, reversing
changes made to 8833bf4a17be131d75db69ed42f8aa8286a24961.