Revert 5ef7cc5..dafbd31

This rolls back to commit 5ef7cc5bb16e3d1005566f613ede9b272cf8982c.