Revert 8ed82d1..5883e54

This rolls back to commit 8ed82d1142d82afe40eaeb2e5321efce8cab3695.