Revert 6fe596d..70861ef

This rolls back to commit 6fe596d0f68b4228ff85a45af75508c9575dbe35.