Revert 24a5cb8..51384d8

This rolls back to commit 24a5cb81d56f4b667a39cad8ec929e584093f007.