Revert e73d911..77aae48

This rolls back to commit e73d911d278b4578594a12040a8f23f00e31255d.