Revert bbe5d29..4526824

This rolls back to commit bbe5d29f10ee349ef5df3f8d527ac709cefe7822.
Revert 4526824..6447323

This rolls back to commit 452682415b34d1a6757c5421f06c26c00df83437.