Revert e456ef8..6db7cc9

This rolls back to commit e456ef8498d2f406d06352d4009742b90ef69326.