Revert a834b70..cb91387

This rolls back to commit a834b7060c5ae39e943ba4a0bf386577e8a600de.