Revert 13b1a12..e6e94f5

This rolls back to commit 13b1a12c466533a9fde914de98678959576f8b2d.
Revert 83a212f..7054558

This rolls back to commit 83a212fc051396f6b4dd113bd4e209d911dfceeb.