Revert 4669056..2da7b46

This rolls back to commit 46690564f5327894c20d8cde42d400b698d89369.