Revert faad4a4..8798ef4

This rolls back to commit faad4a4e429dbe4485b6f875fb52aaa335e40871.