Revert 243fdfb..d20d4e8

This rolls back to commit 243fdfb62b5df41b68bd16532c1c66cbe98bec00.