Revert 719b753..e5a2820

This rolls back to commit 719b753b52c525e8332e730baea82b2599d957f3.