Revert 858dc34..01051ce

This rolls back to commit 858dc3437059236aca476e5cb5b41288e97866f3.