Revert 8899cbf..323761d

This rolls back to commit 8899cbfe46eeb27b924e89b2750d5c2aee0f1079.