Revert 34abbc2..e072e21

This rolls back to commit 34abbc2b0bdf448224613fb185aca9ce96b1133b.