Revert 58915d1..8d1ee05

This rolls back to commit 58915d1cf1165f7361bc41d7dd37fe138d711788.