Revert 526b444..5f99de7

This rolls back to commit 526b444b7499831d9121bfcce5e3596a5e4c606d.