Revert e26a7e7..5e5d501

This rolls back to commit e26a7e713953563c02b94d15304b080b41e0c3c3.