Revert 6d1267b..c331fd4

This rolls back to commit 6d1267b6eeb3c4c1f5752a266d90175b099e88db.
Revert 9718783..25b3d55

This rolls back to commit 9718783599dfac8269b769887b820ac99d639f86.