Revert 777e350..8da61cd

This rolls back to commit 777e350baabca06b6615e2206101ce48e049264b.