Revert 5619b97..7d0043b

This rolls back to commit 5619b976956675664d25e909a5c3f1f277d65048.