Revert 86467b8..096ac30

This rolls back to commit 86467b8f4c6b114ebf19b1196b79e5f564459a7c.