Revert df70ce7..57ec703

This rolls back to commit df70ce70ffd6a03a20228b4b8530765954c0b5b8.